Skip to content

Bump CAPI to v1.7.3 #4915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 11, 2024
Merged

Bump CAPI to v1.7.3 #4915

merged 1 commit into from
Jun 11, 2024

Conversation

@mboersma
Copy link
Contributor

@mboersma mboersma commented Jun 11, 2024 •
edited
Loading

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.7.3. Also bumps cert-manager to v1.15.0 to stay in sync with CAPI.

Which issue(s) this PR fixes:

N/A, but see #4974 for prior art.

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Bump CAPI to v1.7.3

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 11, 2024
@codecov
Copy link

codecov bot commented Jun 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.19%. Comparing base (de31bcc) to head (fe1027c).

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4915      +/-   ##
==========================================
+ Coverage   62.18%   62.19%   +0.01%     
==========================================
  Files         201      201              
  Lines       16878    16878              
==========================================
+ Hits        10495    10497       +2     
+ Misses       5593     5591       -2     
  Partials      790      790

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mboersma
Copy link
Contributor Author

mboersma commented Jun 11, 2024

/cherry-pick release-1.15

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Jun 11, 2024

@mboersma: once the present PR merges, I will cherry-pick it on top of release-1.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

nojnhuh
nojnhuh approved these changes Jun 11, 2024
View reviewed changes
Copy link
Contributor

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2024
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 11, 2024

LGTM label has been added.

Git tree hash: dc0d8272f9a7f533056be838c78739303bf986de

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2024
@nojnhuh
Copy link
Contributor

nojnhuh commented Jun 11, 2024

known flake #4264
/retest

@k8s-ci-robot k8s-ci-robot merged commit 26e8160 into kubernetes-sigs:main Jun 11, 2024
@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Jun 11, 2024

@mboersma: #4915 failed to apply on top of branch "release-1.15":

Applying: Bump CAPI to v1.7.3
Using index info to reconstruct a base tree...
M	Makefile
M	Tiltfile
M	go.mod
M	go.sum
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging go.sum
Auto-merging go.mod
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump CAPI to v1.7.3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mboersma mboersma mentioned this pull request Jun 11, 2024
Merged
4 tasks
@mboersma mboersma deleted the capi-vee-one-seven-three branch June 11, 2024 21:43
@mboersma mboersma mentioned this pull request Jul 9, 2024
Merged
4 tasks
@mboersma mboersma mentioned this pull request Aug 12, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nojnhuh nojnhuh nojnhuh approved these changes

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@marosset marosset Awaiting requested review from marosset

Assignees

@nojnhuh nojnhuh

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

CAPZ Planning
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mboersma @k8s-infra-cherrypick-robot @k8s-ci-robot @nojnhuh